menushell: Use GtkMenuShellAccessible as a11y object

Previously it was only used by GtkMenuBar, and that's a naming mismatch.

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 4c419498a80be458be665084c9a7154f4442365e..c54bc79244be6778f100cc5f278d2530d213d880 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -52,7 +52,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
-#include "a11y/gtkmenushellaccessible.h"
 
 #define BORDER_SPACING  0
 #define DEFAULT_IPADDING 1
@@ -230,8 +229,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                              GTK_PARAM_READABLE));
 
   g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));
-
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_SHELL_ACCESSIBLE);
 }
 
 static void

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 548bcaa809db51b60ca2a84a8d3cb116b8338f2c..9d87b818a6a54ce8df297551f96adf6b5b91c056 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -54,6 +54,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "a11y/gtkmenushellaccessible.h"
 
 #define MENU_SHELL_TIMEOUT   500
 
@@ -422,6 +423,8 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE));
 
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_SHELL_ACCESSIBLE);
+
   g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate));
 }